Follow-up: Improve stopping renderer, fix identity template #61633
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ghost
added
the
ilonatommy
added
the
feature-prerendering
ilonatommy
changed the title
|
/backport to release/10.0-preview4 |
|
Started backporting to release/10.0-preview4: https://github.com/dotnet/aspnetcore/actions/runs/14759993828 |
|
@lewing backporting to "release/10.0-preview4" failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Remove the hard stop - the whole batch has to finish its rendering.
Using index info to reconstruct a base tree...
M src/Components/Components/src/PublicAPI.Unshipped.txt
M src/Components/Endpoints/src/Rendering/EndpointHtmlRenderer.EventDispatch.cs
M src/Components/Endpoints/src/Rendering/EndpointHtmlRenderer.cs
Falling back to patching base and 3-way merge...
Auto-merging src/Components/Endpoints/src/Rendering/EndpointHtmlRenderer.cs
CONFLICT (content): Merge conflict in src/Components/Endpoints/src/Rendering/EndpointHtmlRenderer.cs
Auto-merging src/Components/Endpoints/src/Rendering/EndpointHtmlRenderer.EventDispatch.cs
CONFLICT (content): Merge conflict in src/Components/Endpoints/src/Rendering/EndpointHtmlRenderer.EventDispatch.cs
Auto-merging src/Components/Components/src/PublicAPI.Unshipped.txt
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Remove the hard stop - the whole batch has to finish its rendering.
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
10 tasks
|
@MackinnonBuck, the feedback on how to proceed in case of no data for rendering page after exception removal from #61795 (comment) is relevant also for this PR. The backport PR isn't considered for servicing currently but this one could fix the situation on main. |
src/Components/Endpoints/src/DependencyInjection/HttpNavigationManager.cs
Outdated
Show resolved
Hide resolved
...ntent/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/ChangePassword.razor
Outdated
Show resolved
Hide resolved
...t/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/DeletePersonalData.razor
Outdated
Show resolved
Hide resolved
We rather prefer them to remove the exception and [DoNotReturn] manually. We added this suggestion to the release notes. |
This was referenced May 16, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Follow up for #61306 and #60970.
Feedback
NotFoundPagetoRouter#60970.Templates
-auth Individual) were expectingNavigateToto throw. We should remove this expectation for the new way of navigation.Framework
SignalRendererToFinishRenderingpublic API proposal.Testing
RenderBatchQueuedAfterRedirectionIsNotProcessedmakes sure that no renders connected with async child component are done when the parent triggered redirection in prerendering. Because more than one render mode is tested, I found it useful to reuse the code fromInteractiveStreamingRenderingComponent.razorfor getting available render modes. The common bits got moved toRenderModeHelper.cs.CanRedirectDuringPrerenderingwas removed - its expected behavior changed and the tested scenario overlaps with these covered byRenderBatchQueuedAfterRedirectionIsNotProcessed.